From: Philip Withnall Date: Mon, 30 Mar 2020 11:40:11 +0000 (+0100) Subject: search: Hide search providers which are blacklisted by parental controls X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~684^2^2~511 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=143ab6ac7ffbcc8c47cda7720dfbabc3674aa443;p=gnome-shell.git search: Hide search providers which are blacklisted by parental controls If a search provider is installed by an app which is blacklisted for the current user by their parental controls, don’t show it or results for it. Currently, this only filters ‘remote’ (not built-in to the shell) search providers. This seems fine for now; in future it could be expanded to also filter built-in search providers, if any of them end up needing to be filtered. No corresponding changes need to be made `remoteSearch.js`, because the results of `loadRemoteSearchProviders()` are filtered in `search.js`. Signed-off-by: Philip Withnall https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/465 --- diff --git a/js/ui/search.js b/js/ui/search.js index 88f06211c..f9125123e 100644 --- a/js/ui/search.js +++ b/js/ui/search.js @@ -6,6 +6,7 @@ const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi; const AppDisplay = imports.ui.appDisplay; const IconGrid = imports.ui.iconGrid; const Main = imports.ui.main; +const ParentalControlsManager = imports.misc.parentalControlsManager; const RemoteSearch = imports.ui.remoteSearch; const Util = imports.misc.util; @@ -431,6 +432,9 @@ var SearchResultsView = GObject.registerClass({ _init() { super._init({ name: 'searchResults', vertical: true }); + this._parentalControlsManager = ParentalControlsManager.getDefault(); + this._parentalControlsManager.connect('app-filter-changed', this._reloadRemoteProviders.bind(this)); + this._content = new MaxWidthBox({ name: 'searchResultsContent', vertical: true, @@ -505,6 +509,11 @@ var SearchResultsView = GObject.registerClass({ _registerProvider(provider) { provider.searchInProgress = false; + + // Filter out unwanted providers. + if (provider.appInfo && !this._parentalControlsManager.shouldShowApp(provider.appInfo)) + return; + this._providers.push(provider); this._ensureProviderDisplay(provider); }